From 8839be5c1fe339a1310b4e05e88c5a0230b7959d Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Fri, 5 May 2017 17:09:49 +0200 Subject: [PATCH] x86/public: correct register naming Commit 897129deab ("x86: use unambiguous register names") went a little too far: With it we also get register names like _e15 and e15 for non-Xen consumers using a gcc compatible compiler. Correct this. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Release-acked-by: Julien Grall --- xen/include/public/arch-x86/xen-x86_64.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/include/public/arch-x86/xen-x86_64.h b/xen/include/public/arch-x86/xen-x86_64.h index 6e74cb30ee..978f8cbf70 100644 --- a/xen/include/public/arch-x86/xen-x86_64.h +++ b/xen/include/public/arch-x86/xen-x86_64.h @@ -173,7 +173,7 @@ struct iret_context { #define __DECL_REG_LOHI(name) __DECL_REG(name ## x) #define __DECL_REG_LO8 __DECL_REG #define __DECL_REG_LO16 __DECL_REG -#define __DECL_REG_HI __DECL_REG +#define __DECL_REG_HI(num) uint64_t r ## num #endif struct cpu_user_regs { -- 2.30.2